Make method detection more clear