More refactoring and User access based objects