Added preparations for user management