Reset logic change and adding new util classes