WIP Derivation refactoring