Updated to support version 1.21