Adding message support from VID-515