Added better clang support