New options handling