Namespace injection fix in Defaults