Added object/sprite support