Upgraded anntotations of main package.mo