change structure, add sqlite storage