Make more methods public