Incoroprates support for Atom from baron-1.0.13