Updated for Ti SDK 3.1.1