Moved Storage logic into a separate assembly