Updates for CDI MVP 0.9.2