Updated pon to support deployment