Removed mapping. Enhanced conf parsing.

If necessary mapping can be added later.