Restored workaround for database storage