Changed visibility on some methods