improved policy loading