Changed services/helpers to async
Reworked DI