Adding CDI annotations to make it easier to setup