Started refactoring of AccInfo