Improved persistence layer