Changes to support Zepto