Refactor options and add now --ignore-exsiting option

Needed for serverside 2.4.0.