added support for p,a,c,k,e,d based source evaluation