Added logging and extended TextMapper.