Added support for PAR and RAW codes