Added flexibility to Atom class