Because of some inter-dependencies here I'm doing a big patch that changes
many different things. Forgive me

Signed-off-by: Federico Vaga <federico.vaga@cern.ch>