Add expiry, priority, custom field support