Interface changes and code changes related to the earlier persistency modifications. Current changes will fix interafces and code.