Restored some storage helpers