Added constructors to structs