Updated to work with 3.6 SDK