Bring case classes in to line with new ES mods