Modified Atom class