New option implementation added