add temp_id support