Updated singleton