Port uri-cp improvements
Update to handle updated init script