Added mapping facade and other stuff