Changed how the application discriminates data