Update of fetch of data - couple of cols added, cleanup of code, better exception handling