Feature/mojo and cdi