Small changes, playing around cdi annotations