Added handling of atoms to bring inline with jsx