Updated model relations and acl