Updated to include CDI sample