Added context to namespace