Missing library for injection. Builder for advertisment package. Clearing some mess around null checks and defensive copying.