Updated for 2.0 API.