Refactoring of __call__ - adding of context method