Change 'policy-core' to support app persistence