Intra xpointer refactoring