added embedded persistence support