Added context module and dependencies