Please add proper support for SHIB and MATIC