Added an Object class and updated the engine to use it