Use const in more public API methods