Improved and extended XScript