better mapper Filename etc.