Class hierarchies fixed