Supply context in dedicated modules and remove context module #33