Updated create and update template with latest Common Classes