Include properties per environment in messages #70