Fixed User and added UserRole.