Add error handling for upload file removal
Use boolean isShortRange instead of enum (which doesn't work with JSON)