Better options handling