added companies and locations as separate objects