Added Singleton and Changed Port