Moved context to sub module