Declared associations in model classes
Merge branch 'aric'