Added support for Company requests and fixed a couple of minor bugs