Main class improvements