Added Proid attribute and minor tweaks