Start of refactor user to more generic subject interfaces
Minor refactor