Dynamic Mapper with better results now