Added singleton and stuff