Fan Current module refactoring