Adds support for Singularity