Added fluent api