Resolved TS compiler issues

Started working on DI