Add optional module name/dependencies support