Compilator enhancements