Added choice and prerequisite classes.