Completed 1:1 mapping from PCL project to .Net 3.5.