Options improvements