Added more hashsets for logic