Refactored SystemUser to just User to comply with naming