Change some methods to public