Issue #24: refactor of fte.defs