Added more XPS functionality