Add @objects support