Optimization on singleton