Add fluent interface and change logic so annotations uses fluent mode behind curtains.
Add fluent interface and change logic so annotations uses fluent mode behind curtains.