Make policy more flexibly configurable