Refactoring name containers to use key.value
Adding namespace and filter in system class.