#0.27 API refactored