Changed back to non-dictionary user config, due to issues/3