Added support for different mapping strategies, initial test passed for simple mapping.