Groovy part removed; Ping graph and agent added; refactoring