added a context to filter calls