Update to move storage to connections