Updated Agent to call the new constructors