Added Singleton Class + Bug Fix