added resolve_object