Some Functional unit related classes refactored.