Refactored sources