Adding support for legacy compilers