Updated warning and message handling