Minor class level changes