Added context decorator