Switched to registry pattern