More work on Prophecy support