Summary refactorization and fix