Introduce proper API (by Leandro)