Company schema improvements