Some changes. We need a proper hack for structs.