Improve and expand say hooks