Context refactor, to use Module instead Class