Extension handling moved to name-space. Inject matadata error handling improved.