Made time based rescanning optional