Refactored service and form implementations