Migrate to fluent interface