removed the lazy instantiation from singleton to avoid threading
problems.