Add singleton support [IMMUTANT-427]