SP dependencies rework