Added class for delay scan