Added thanks_to handling