Made policy immutable, slimmed down api