Added more baseclass calls