removed singleton class because it overwrote application context.