Changed SCVA to work with singleton.