Refined class hierarchy