Refactor complex areas
Update metrics config
Update CI config