Added support for the recent changes on the compiler