Refactoring to support troposphere/atmosphere