Slight refactoring to group domain-specific feature functionality, divide it from domain-independent feature language interpreter.