Changed contribution creation and update to new structure