Added singleton constructors to needed classes