Added context support
Added context support