Update for storage to now use vector