Add support for fluent syntax, add test for it