Added associated object support