Improving properties file handling + Improving activation of metrics