DI changes + serialization sample