Company added - re engineering of some foreign keys