HV-755 Taking inheritance into consideration