associations support
Merge branch 'associations'