Add zf1 support