Modifications for xpcc platform