Move contract to PCL