Changed from array to struct