MPNS support added