Moved MaperProvider class to separate file