Fixed class inheritances