Update API to be consistent with the Python API

Signed-off-by: Claudio Matsuoka <cmatsuoka@gmail.com>