Add optional support for the company identifier while maintaining backwards compatibility