#143 Change Policy to use keys rather than entry to allow more efficient implementation