Performance measure part moved to module