Related to #2
 Final set of initial persistence-related objects
 Refactored DI mechanism to use @Inject and @Named instead of @Autowired
etc