Update to use the new Self Contained Agent

They’ll be useless once the self contained agent is released
Can you move the trailing / to be part of the attribute definition below?
Also, 2-space vs 4-space please.