Move to 1.1 API