Modified struct to use pointer notation