Updated singleton return type