More stable storage and models