Added associations and migrations