Updated to support version 1.2.2