New version with ShEx validation