Updated to use di from BigBlock;