Further enhancements to SRLG and int importer