Updated the base files to give more message information.