Updated BaseClass