Improved XPointer support