Added AbstractModule for DI.
AbstractModule added to DI (+ bug fixes)