Added context support