New build system, same as the old build system; Add normalize