6 custom support

Closes #6