added more measures to import