Better support for atomic elements