Implementing 3.9.0 API