Properly support extra field