Fix bug in identification process, improve configuration files