Added fluent-api code generation