Made company optional [MJ-607]

All tests pass.