Replaced typedefs with actual types