Updated Global.java and MessageHelper and added TODOs