Added support for more compilers