Updated to support 1.6 and 1.7

Updated to support 1.6 and 1.7