Add is_object condition