Fixed and enhanced support for structs and records