Added Fluent-API support