Adding additional logging