Replacing some private methods