Update Code Changes to support 3.1.x