Polished options handling