Initial MPNS commit