Added ability to work with both 1.2 and 2.0 version