Made some changes in Company Location entities