Added Objects and improved current types