Initial work towards enabling CDI across the application suite