Change to 1.0 API