updated generic import