Major changes for kefed model save