Changes required after PCL changes, still need to fix Images