Added nullCallback and DI for debug