Add support for normalize