Refine singleton implementation