Frequency service refactored