Add better identifiable messages