Updated modules inheritances