Change attributes to come from schema rather than instance variables
Fix class method typo