Changed to Artemis and Composition based design