Improvement/maintenance 3.x/more os metrics