Updated project to support Atmosphere