Modifications due to MultiCompany capabilities