Updated for 1.1 API