Updated to support 1.7 target and source version.