Reorganized completion options: Made them singleton