Updated model associations, and routes