many refactor - now new features base on promises and fluent api work