enhancements for cdi and post refactoring