Added proper inheritance