Some struct improvements