Refactored Content Edit service