Reworked options handling