Added additional logging and information