#25 More improvements to the fluent interface