added support for raw code