Add singleton and refs