Added use of new (1.3 a2) MPN APIs; removed use of local storage;