Extrapolated criteria handling into separate file.