Updated for 2.1.1 SDK general availability release