Added some inheritance