Add the compile time check for 6.0