Make disposition-type configurable, close #522