Add additional logging;