Improved version of the JavaPNS