[Feature] Added two more supported "context" types