Improve atom definition