Factored out common template code and added companies