introce diffusion refactoring
start to restore filtering workspace.