Do these changes make sense for db storage functionality?