fixed mapping and concurrency issues