Modified struct to use arrow operator