Updated to add some default options