fixed withDefaultMappings()