map update and injection type refactor
Merge branch 'injection-updates' into openfl-project-updates