Made some methods protected