Redesign of the option managment.