Fixed misleading class hierarchy