Architecting class defs for future use; no substantive changes made