Review and fix block implementations

Let's inject all services that we need in this classes.