Switch to a C based storage model