Updated singleton methods