Added support for Atom, Go, Next