Removed annotations in favor of metadata in package.jdo