Improved policy checking