Migrate to 2.1 API