Pushed some methods to private