Moving to a more dynamic storage model