Bring in 3.6 specific class/functionality