More modman changes
Mor emodman changes