Improved Zepto support