configuration files logic updated