First attempt at implementing support for custom tasks