diff --git a/src/main/ts/di/Annotations.ts b/src/main/ts/di/Annotations.ts
--- a/src/main/ts/di/Annotations.ts
+++ b/src/main/ts/di/Annotations.ts
@@ -9,6 +9,7 @@ export interface Dependency<K extends ke
     $dependency: K;
 
     lazy?: boolean;
+
 }
 
 export interface Lazy<K extends keyof any> extends Dependency<K> {
@@ -34,11 +35,6 @@ export class Builder<T, S extends object
     }
 
     inject<P extends any[]>(...args: P) {
-        // K = "bar"
-        // M = "setValue"
-        // S[K] = Bar
-        // T[M] = (value: string) => void
-        // P[m] = (value: V) => void
         return <X extends { [m in M]: (...args: any) => any }, M extends keyof (T | X)>(
             target: X,
             memberName: M,
@@ -48,17 +44,26 @@ export class Builder<T, S extends object
         };
     }
 
-    getDescriptor(): TypeRegistration<T, any, S> {
+    getDescriptor(): TypeRegistration<new () => T, S> {
         throw new Error();
     }
 
 }
 
+export interface DependencyOptions<T> {
+    optional?: boolean;
+    default?: T;
+}
+
+export interface LazyDependencyOptions<T> extends DependencyOptions<T> {
+    lazy: true;
+}
+
 interface Declaration<S extends object> {
     define<T>(): Builder<T, S>;
 
-    dependency<K extends keyof S>(name: K, opts: { lazy: true }): Lazy<K>;
-    dependency<K extends keyof S>(name: K, opts?: any): Dependency<K>;
+    dependency<K extends keyof S>(name: K, opts: LazyDependencyOptions<S[K]>): Lazy<K>;
+    dependency<K extends keyof S>(name: K, opts?: DependencyOptions<S[K]>): Dependency<K>;
 
     config(): Config<S>;
 }
diff --git a/src/main/ts/di/Configuration.ts b/src/main/ts/di/Configuration.ts
--- a/src/main/ts/di/Configuration.ts
+++ b/src/main/ts/di/Configuration.ts
@@ -32,24 +32,23 @@ export interface RegistrationScope<S ext
 /**
  * Базовый интефейс конфигурации сервисов
  */
-export interface ServiceRegistration<T, P, S extends object> extends RegistrationScope<S> {
+export interface ServiceRegistration<T, S extends object> extends RegistrationScope<S> {
 
     activation?: ActivationType;
 
-    params?: P;
+    params?: any;
 
     inject?: object | object[];
 
     cleanup?: ((instance: T) => void) | string;
 }
 
-export interface TypeRegistration<T, P extends any[], S extends object> extends ServiceRegistration<T, P, S> {
-    $type: string | (new (...params: P) => T);
-
+export interface TypeRegistration<C extends new () => any, S extends object> extends ServiceRegistration<InstanceType<C>, S> {
+    $type: string | C;
 }
 
-export interface FactoryRegistration<T, P extends any[], S extends object> extends ServiceRegistration<T, P, S> {
-    $factory: string | ((...params: P) => T);
+export interface FactoryRegistration<F extends () => any, S extends object> extends ServiceRegistration<ReturnType<F>, S> {
+    $factory: string | F;
 }
 
 export interface ValueRegistration<T> {
@@ -64,12 +63,16 @@ export interface DependencyRegistration<
     default?: ContainerResolve<S, K>;
 }
 
+export interface LazyDependencyRegistration<S extends object, K extends ContainerKeys<S> = ContainerKeys<S>> extends DependencyRegistration<S, K> {
+    lazy: true;
+}
+
 export type Registration<T, S extends object> = T extends primitive ? T :
     (
         T |
         { [k in keyof T]: Registration<T[k], S> } |
-        TypeRegistration<T, any, S> |
-        FactoryRegistration<T, any, S> |
+        TypeRegistration<new () => T, S> |
+        FactoryRegistration<() => T, S> |
         ValueRegistration<any> |
         DependencyRegistration<S, keyof S>
     );
@@ -86,11 +89,11 @@ const _activationTypes: { [k in Activati
     call: 5
 };
 
-export function isTypeRegistration(x: any): x is TypeRegistration<any, any, any> {
+export function isTypeRegistration(x: any): x is TypeRegistration<new () => any, any> {
     return (!isPrimitive(x)) && ("$type" in x);
 }
 
-export function isFactoryRegistration(x: any): x is FactoryRegistration<any, any, any> {
+export function isFactoryRegistration(x: any): x is FactoryRegistration<() => any, any> {
     return (!isPrimitive(x)) && ("$factory" in x);
 }
 
@@ -311,7 +314,7 @@ export class Configuration<S extends obj
         return v;
     }
 
-    _makeServiceParams(data: ServiceRegistration<any, any, S>) {
+    _makeServiceParams(data: ServiceRegistration<any, S>) {
         const opts: any = {
             owner: this._container
         };
@@ -365,7 +368,7 @@ export class Configuration<S extends obj
         return d;
     }
 
-    async _visitTypeRegistration(data: TypeRegistration<any, any, S>, name: string) {
+    async _visitTypeRegistration(data: TypeRegistration<new () => any, S>, name: string) {
         argumentNotNull(data.$type, "data.$type");
         this._enter(name);
 
@@ -386,7 +389,7 @@ export class Configuration<S extends obj
         return d;
     }
 
-    async _visitFactoryRegistration(data: FactoryRegistration<any, any, S>, name: string) {
+    async _visitFactoryRegistration(data: FactoryRegistration<() => any, S>, name: string) {
         argumentOfType(data.$factory, Function, "data.$factory");
         this._enter(name);
 
diff --git a/src/test/ts/mock/Bar.ts b/src/test/ts/mock/Bar.ts
--- a/src/test/ts/mock/Bar.ts
+++ b/src/test/ts/mock/Bar.ts
@@ -6,8 +6,9 @@ export const service = define<Bar>();
 @service.declare({
     foo: dependency("foo"),
     nested: {
-        lazy: dependency("foo", {lazy: true})
-    }
+        lazy: dependency("foo", { lazy: true })
+    },
+    host: "value"
 })
 export class Bar {
     barName = "bar";
@@ -18,7 +19,8 @@ export class Bar {
         foo?: Foo;
         nested?: {
             lazy: () => Foo
-        }
+        },
+        host: string
     }) {
 
         if (_opts && _opts.foo)