Add context if missing
Remove unnecessary properties for isChat