improvents in fluent API to build helpers