improve mapper and formats