Added parse-atom