Added more to struct