Added proper advanced compiling support