Moved storage from a callback to an object to better handle subsystem connections.