Refactored hero module