Add agent definition and fix system OS string