Start of agent support and various improvements