Reworked optional system