Refactor to handle user rights object