Changed definition of a template object and disabled objects