Add variable names to be able to debug it
Fix update_attributes to work with ActionTriggering
Better message for LockConflict error