Adding zf-tools