ADDED: updated the collection references in the model to correctly implement associations