better grant_types support