Datafield name and type changes to bring it in line with GAE example