Add logic to ignore default/built-in options