Changed architecture to reflect the 1.7.2 release