Added type normalization for easier usage