Modify condition to allow Absolute conditions and time conditions