Reverting some changes to inst def service and having Agent include by
String