Cdi additions

fixing classes to be compatible with cdi