Configurator should be more flexible. Closes #14