* init * DI and other improvements * type fix --------- Co-authored-by: Volnei Munhoz <volnei@cal.com>