Updated to include CDI