Added Singleton class and Inputs.