Updated to allow for more default options