Added User and User Role classes