Improve options handling with default options