Improve variable name.
Factor the instanciation of persistent tables.
Refine a bit the queries management to integrate them more in the persistent tables.