Added context map in both data operator and data interceptor