Use new builtin API
0.5.0