Cleaned up hierarchy, details