Added singleton class and changed some log messages