Reorder methods
Simplify authentication parameters