Added weather support