Added code quality & coverage