User and Role model revisions