Added associations and created controllers