Implement RFC 3319 options