Converted to class/subclass structure using Klass.