More proper API coding style :)