Support for retries, better error handling and status configuration