added 6.0.x EAP6.1 + modules