Finished arch 2 with metrics generation