Improved performance, compatibility with zf