added complete raw code support