Bugfix to make PersistenceBase CLS compliant.