More work on Xtension.
Work on Xtensions.