Better atlas support.