[#3229] Improved API