Restructure for persistent rbfmodel