Convert method to association
Fix ordering in table