Fixed API to make various methods private