Move persistence class to base core