Improved map integration in default stage.