Rework implementation for nmss framework