Updated for Titanium 3.2