Updating to support DB storage