Updates to use with 1.3.1