Add enhanced Struct behavior
Fix version specifiers
Fix failing test