Improved type safety with Persistence Interception