Added configuration for serviceloader.
Updated InfoRetriever classes