Worked on db and model associations