More API revisions: Moving the Entry classes out from the Batch classes.