Modified the models to match up with current Open Elections direction