Framework improvements, delete deprecated apis, better handling of atom transactions