Added equinox support