Tools support for Citrus