Added new stuff which breaks the clang compiler