Support 1.3.0 API