Add objects and locations