Even more clean up: extracted mappers from facade