Start getting rid of obj_name argument