Updated for khepri V0.21