Fixed inheritance & composition direction