added more model associations
refactored hashes based on new model associations
Merge pull request #21 from dgokman/refactoring

Refactoring