[#3579] More meaningful API