Reverted to old version of support library since new one was breaking the method limit count