Added more base class fucntionality