DEP-45 functional Component, some refactoring