Added diagnostic messages