Made minor changes to expose a few public API methods