psfExecutor refactored