Added object class, needs cleaning