added proper inheritance of classes