[Config] Move normalization