Added more smart responses