Make storing data work with new mechanism