Upgraded cdi mvp