Removed the inheritance hierarchy