Changes to reflect work to update project to Artemis 2.0