Updated to work with 0.21