Added schedule and policy