Monthly metrics source and some refactoring