Improve: naming/API
Add: DocBlocks
Add: support for fluent interface