Refactored Hadouken.Service.