Module now supports shop module as well