Use more consistent API