SCDM-5: Extend class list and design objectives

Issue-Ref:5