Updated singularity to C++11