Updated options handling