Fix #20: Ensure required options are set