Moved to Atmosphere framework