Adding proper support for custom named associations