Added persistent entities for user management