Added code so that message vendor codes are not hardcoded.