Moved class to CDI.