Added context in marketplace packages