Adding atom builder