Z-Ray extension for Zf-Commons