IMP general improovements on check to work with multicompany environment