Added object names + offsets