Moved some methods to protected area