Some changes how to aquire classes