FEC-1851 add companions support

updated