added wrap_id support.