Made more explicit the public api definition