Added class diagram + small OCL fixes