Add support for manifest and modulepath in master section