Updated on baseclass/interface changes.