Improved support for custom submission