Singularity template + new demo features