Add an agent, with macro and template and template dependency. Remove the delayed part, should be set only for server (to be done)