Refine parametric types; Add type alias