Replaced structs with classes