Updated for CDI MVP and CDI Properties add-ons