Reorder methods and add ::methods()