Code Cleaning
Added enrichcontext