Extension 6.1 ready