Fix injection container, re-design mapper for better dependency management