Added more information to messaging