Resolve unmapped type by injecting mapped arguments

- Resolve unmapped type by injecting mapped arguments
- Internal refactoring of namespaces