Added TinyIOC + Image Builder