Added singleton management