Added context requirement to modules that were missing it