Added nested classes to Set Definition Format