NEW: Service wrapper