Main class updates