Added inheritance cheks