Reflected some changing the cmd scripts and the template files