update resolve and declare new types for di