Fixed build, strated adding fluent support
3 files changed