Added singleton setup