Changed callback methods to private