Replace normalizeProperties with getter/setter