Improve internal warning mechanism