Add normalize and modernizer