Fixed atom support
Disabled atom_reader; not used anymore