Cleanup code
New configuration working. Need some small refactoring
Improve the fluent interface
More fluent sugar