Make nosql ready