moved to persistentmodel