Move agent settings outside