Added pnsdk param + some fixes