enhance entitycontext