Replaced typedef by using