Should make further additions and refactors easier.
Some options have changed so set them so that signing works properly.