add separate blocks for persistence, utilities, dependency injection