Fix data storage mechanism