Refactoring for Spray integration.