Some improvements to Import Monitor