Added associations and more fields