Made some methods public