Adding support for custom association names and foreign keys