Partial fix to classes and architecture definition.