Change Inheritance Types

Signed-off-by: Pouyan Heyratpour <P.Heyratpour@Gmail.Com>