Add support for enclose option.