Tweaked the presenter decorator
Improved the service provider
Added a facade
CS fix