Added display object classes (wip)