Changes to allow import of custom rows