Moved out the properties from the methods in the user classes. They are
only in the constructors now.