Updates with new approach from Josh's groovy configurations.