Updated mapping for objs :ok_hand: