Proper options handling