Added object support