Move binding of classes to the ServiceProvider
Code tweaks