Improve data retrieval - still not perfect, but gets most applications