Refactored and cleaned up CDI extension
Refactored and cleaned up isProxy