Further wordsmith PE support