move xpath2.0 support to seperate package