Add support for custom option defaults