Changed extras to xpaths and updated schema used