Added support for fluent interface