Changed the way 2D objects are handled