Add join support for updates
Add join support for deletes
Clean extra space