More configuration options
Fixed proper module handling and whitespaces