refine PAAS handler