Refactored into "service" beans