A complete circuit would also include the National Theater, and the National Museum of Modern Art.
Visiting the National Theater and the National Museum of Modern Art could each take up an entire day of exploring.