Added CDI enviroment discovery