Added ability to change default options