Added better support for clang