Small changes, options needed for data migration

In progress, do not merge yet
this trigger, needs to unshift 'error' into the args