Removed <<ordered>> stereotypes, need to add order attribute explicitly