use associations
Merge pull request #68 from bitzesty/use-associations

use associations