Added manifest normalization