Refactored XML builder to add weather targeting