Some changes to make possible to override some methods