Increased coverage for option encoder