Refactored atom classes