Added User and Role models