add goal and model support to dsl grammar
adapt strategy definition to the last grammar changes