Submodules for savvior, enquire and sticky added