Struct and Validation fixes