Added Tons of object classes