created natural keys and dump methods
fixed merge conflict in scripts