@Naveen

Convert classes to singalton pattern