Make some changes to support the new API1.1.