Ksp manager rework