Working machine registry, session cache. Refactoring to namespaces.