Changed some method visibility