Added context to feature