More changes to mapper, added a lot of posibilites for advanced configuration.