new helper for mapping and fixes in pool