Preparing for 3.1 extension