Improved idempotency and removed ip detection