Feature: added context parameter