@cmfcmf @drak any opinion on that comment? Should we refactor it? We don't want to wait too long since I've got at least three modules using the API already... @cmfcmf if you want to do this today that would be ok.