More object class work