Added support for directory modules
Applied changes for Wakanda