add_xxx now returns location object