Added watch and state namespaces