Removed ConcurrencyException issues