Add time conditions check