Added additional default options fixed bug