Import changes to Hubic from the new rules