Improve configuration module (see #17)