Adding a persistence layer for faster loading