Adapt to pattern of textual

commits for #42