Added atom parsing