Changes: take out policy definition and make it modular