Sorted out TODO. Direct generators are now configurable as they should be.