added roles and updated models