Added framework for dynamic epsilon selection