Builder
Dependency injection
Tests
CR fixes