More work on Xtensions.