Policy extended to include additional elements. Groovy compiler version changed to 2.0.