Added Readonly to couple of fields